Stuff
Lots of styling, ionicons, etc
Merge branch 'styling'