made it so that while activity list is being updated because selected project changed, you cannot select activity; and some code clean-up refactor