design adjustments, remove non-MVP functionality