Feature layout

Please add it or else the kitty dies!