Reworked the code to look more like most android apps. Lots of code deleted so check it before merging.