Updated demo + overlay view bugfix