finished helpers
new layout
fixed conflict
adds static pages