Refactoring Code, improved UI

Implemented settings structure