Fix folder paths in the main UI and code style cleanups.

Change-Id: Ie35f4e4ce9b92091c1340605ab4153e6b1a3e7e9