More HTML/CSS fixes

Trying to consolidate code more effeciently