Organization of CSS and HTML

Also added some buttons.