Improve New Sub-Project and New Task button logic