Changes to put all screens in place and more styling