Continued working on dev page