Overhaul of Options Window