Reorganize CSS and better name IDs and classes