First steps at UI + building refactoring