Cleaning up some model names and files, working active link_to in header