modified style and some changes