Cleaning-up style page, moving some CSS