Made main screen "pretty" - feel free to change. This just means we have
something there.
Merge remote-tracking branch 'origin/master'