Updated layout
Style tweaks