added pretty urls & includes