Fixed several issues with narrow-display layouts