finish adding routes and layout