close button + some style and small (bug) killed
Merge branches 'feature/web-dev' and 'feature/web-dev' of https://github.com/dolstrm001/Demeter-Project into feature/web-dev