finish adding layout and routes