fix display issues, clean up android project