Merged old layout with new. Renamed according activities.