Marius's profile update
Fix padding on non-touch devices
Marius profile minor update
Merge branch 'develop' into profiles
Merge branch 'develop'