Changed layout to only use one screen for modifying information