fix bad merge and minor css tweaks