Full refactor of UI based on UX review

delete dead code