Work on #30, visual improvements