Changed UI and modified singleton