CSS fixes
Issues #1 & #2 fixed