Fix right-side buttons alignment.
Make code somewhat cleaner.
Add that one forgotten action.
Conform layout to the current layout reading code.
Code cleanup.

Now using macros to reduce code length a bit.
Cleaned up some comments, made other comments make more sense.
Merge remote-tracking branch 'origin/softUI' into softUI