Moved UI into module