Merging stylesheet and minor tweaks