Fix #441 - Updated the layout