adjusted dashboard and logining