Removed extra junk and added button