Add more UX tweaks
Merge after pull
Fix merge on project view