Update layouts
Redesign UI