minor fixes to the UI
minor fixes to the UI
Merge branch 'upstream-develop' into fix/haptic-feedback

Conflicts:
	app/views/home/main-activity.html
minor fixes to the UI
minor fixes to the UI
Merge pull request #220 from jofomah/fix/haptic-feedback

Fix/haptic feedback