Cleaned up onCreate, added button listeners