BRANCH 4.1-DEV: Minor modifications to layout