Renamed activity layout to be more general, added more to the model