layout adjustments
Merge commit '148067ee38f7b0868f42688514aa6785dbbdce6c'