Lots of refactoring. More androidy looking.