Merge from develop
Layout fit into monitor, smaller spaces