CSS organization, restructuring stack html, fixing some spacing