Tweaked front-end, added correct quotes