With the decision about the layout made, everything is simplified and cleaned thoroughly.
Looking at it now, the code isn't even that horrible :)