added logout and removed settings from loginsceen
merge