final ux/ui changes and bug fixes before presentation