Added some layout and CSS