Build #44

Graphical rework on Settings
Major Refactoring