Android GUI fixes