small style fixes and clean up
options hover button style
options popup final
reformat
fix refactor mistake
small refactorings