More redesign..slowly but surely