css
urls and api
feedback additions
fixed conflicts