update style and few bugs