scaling correctly now on a nexus 5 and some theme fixes