Cleanup by tag layout
Add some validation specs for Project