clean up code, better icons, improve option page formatting