Improved the general appearance of the app with flat-ui and others.
Merge remote-tracking branch 'origin/master'