Various ui tweaks.
Merge branch 'master' of https://github.com/chessdork/smogon

Conflicts:
	app/src/main/res/values/styles.xml