Reupdated Screens

Addbuidling delete building and editbuilding minor changes to
consistancy