Fixes for 2.x
Minor layout fixes
Fix #223
Fix #224
Merge branch 'developing' of github.com:azapps/mirakel-android into developing