Progress on the main layout 2