First push at redesign. Some iconography and controls aren't done yet...