Working on Main interface 4

A looooot of code cleanup