Moved UI into Model project