New Webstarter Template & Bug Fixes