added settings to set unlock screen and some fixes