General UX and code cleaning