Removed redundant textview
added onClick properties to buttons :P
Updated, and removed unused, view ID's