Layout changes in errors and editor page
Merge branch 'tanveer_1.12' into umair_newui
second step fix