Apply new design and layout #WIP