Update bootflat to v2 and make some slight UI tweaks
Merge branch 'bootflat-update'

Conflicts:
	.gitignore