Registration finished, minor fixes and more UI interaction