Added some layout/css improvements