Added a lot of screens, code needs cleanup and tweaking
Project update