added layout application to user screens
fixed a typo
merged
merged