Started redesign

started the redesign work based on @Sandrinok's work