UI Clean up and Android ports