modified the layout, and added it to all screens