further modifications on the layout