made some few design changes