consolidate css in style.css and bugfixes
rearrange/add options, update css