android: Cleanup whitespace and improve GUI logic