Testing with Nexus 5 Black
Fixing UI errors