Adding Changes to stuff

updated a lot of screen and what not