UI changes incomplete
Merge branch 'develop' of github.com:geohacker/12th-plan into develop