change to pg
Finish layout and routes