refactoring; delete pictures :( ; some progress in GUI