Refactoring, moved info to separate file
Some ui cleanup