Make the layout closer to the psd file. WIP #2