Tweaks some UI and finished the basic inbox stuff
Forgot to add this to Git...
Merge remote-tracking branch 'origin/master'