Handles show/hide feature. Small redesign and fixes.