Fixed routing issues, fixed single item view