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

Change-Id: I99257cd25d0d1e0f9b4cc6dc61469744c8dff9d2