Started on re-structur of screens and connections