Layout adjustments, and task count in drawer
Merge branch 'feature/presentation' into develop
Fixed merge wonkyness in loginactivity