Added accounts settings model
Bug in account setting
Tweak to settings