Minor visual tweaks
Implementation to do handle multiple projects