Fixed initial steps and dashboard pages