GUI improvement

- Modified GUI for more logical placement of options
- Modified calculation of bitmap width to take scrollbar
  visibility into account