diff --git a/doc/features.dox b/doc/features.dox
new file mode 100644
index 000000000..27da4a060
--- /dev/null
+++ b/doc/features.dox
@@ -0,0 +1,8 @@
+namespace Magnum {
+/** @page features Feature overview
+@brief Fundamental principles and design goals
+
+- @subpage matrix-vector - @copybrief matrix-vector
+- @subpage collision-detection - @copybrief collision-detection
+*/
+}
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index fd394ae85..3894d8a1f 100644
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -48,10 +48,10 @@ help you with object hierarchy, transformations and resource management.
 
 @subsection getting-started-examples Tutorials and examples
 
-The best way to get started is to @ref examples-triangle "render your first triangle"
-in step-by-step tutorial. Then you can dig deeper and try @ref example-index
-"other examples", read about fundamental principles in the documentation or
-start experimenting on your own!
+The best way to get started is to render your first triangle in
+@ref example-index "step-by-step tutorial". Then you can dig deeper and try
+other examples, read about @ref features "fundamental principles" in the
+documentation or start experimenting on your own!
 
 @subsection getting-started-hacking Hacking Magnum
 
diff --git a/doc/namespaces.dox b/doc/namespaces.dox
index ff7bf5656..6c1ff042a 100644
--- a/doc/namespaces.dox
+++ b/doc/namespaces.dox
@@ -90,7 +90,7 @@ Collection of shaders for testing purposes.
 /** @namespace Magnum::Physics
 @brief %Physics library
 
-Collision detection system and rigid body objects. See @ref physics
+Collision detection system and rigid body objects. See @ref collision-detection
 for introduction.
 */
 
diff --git a/doc/physics.dox b/doc/physics.dox
deleted file mode 100644
index 6a914c457..000000000
--- a/doc/physics.dox
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Magnum { namespace Physics {
-/** @page physics Physics library
-@brief Collision detection and rigid body dynamics.
-
-@subpage collision-detection
-*/
-}}
diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h
index 2d5b410b9..b52513f3a 100644
--- a/src/AbstractShaderProgram.h
+++ b/src/AbstractShaderProgram.h
@@ -47,6 +47,7 @@ typedef Attribute<2, Vector2> TextureCoords;
 @endcode
    @todoc Output attribute location (for bindFragmentDataLocationIndexed(),
         referenced also from Framebuffer::mapDefaultForDraw() / Framebuffer::mapForDraw())
+
  - **Layers for texture uniforms** to which the textures will be bound before
    rendering, for example:
 @code