Merge horizontal layout changes
Resolved merge conflict; removed redundant css/js tags from layout