Issue #160 - Fix Frontend
Issue #160 - Fix backend