Updated version with Designer refresh on save