updated with HTML, reorganized CSS