Did some UI cleanup on both Android and WinPhone versions