Added new focused layout, ditched some old ones