Working on fixing safe

- Trying to fix rendering of safe
- Reorganized some classes