More HTML/CSS Fixes