Task #3894 Improve main layout