updated some stuff
updated with ui-router