Started redesign of interface