Implemented more gui