Issue #160 - Edit frontend code