Fix filename
Pass logged in user to the view
Add settings entity
UI Changes