option window code cleanup

and made the window a fixed size, regardless of what tab is active
Merge pull request #1213 from Soul1355/master

option window code cleanup