Syncing with desktop.
Making the main page look fancy.
More layout work.
Merge pull request #11 from deadVertex/master

A bunch of unmerged commits from my fork.