Refactor/display changes  closes #30