modified the layout and some widget layers