minor restructuring of CSS, need to clean it up later */