Layout tweaks
Fix text size on demand dialog
Merge branch 'master' into cydia