merged signup activity and rest of app content