Reorder navbar
Streamline UI naming
Merge pull request #8 from cmonaghan/master

Update UI