reduced the number of new project objects are instantiated, also keep current project highlighted
moved some code around