UI tweaks
first instead of last
Merge pull request #373 from leider/master

UI tweaks