Removed fragment and added basic functionality to activity