First code cleaning
Interface changes, just look and feel