Fixed a few issues with recent refactoring
Updated screenshot