user view complete + bug fix on settings view