UI changes and made an optional password system