Minor changes to layout
merging changes in functions.php