3,madigan6: refractored and updated UI and MainActivity