Added linking for settings and account