Added css, changed flow of some of the options