Added optional cancel button for EnterPasscode screen and other misc fixes