Re-structure project status feature

Tough day !