Redesing and removed extra class