Separated pages and added routing