#808 - more changes on layout