Added some layout touch ups