Merge Project View

Ajay's part