merge conflicts
styled about overlay, closes #10