Added basic layout
Improved design