Refactoring and projectList button enhancements