Repositioned the options bar

The options bar has been repositioned. It is now at the same position as
the top bar.

In addition, the main XML files have been simplified.