design changes and buggs fixed
design and bugs changed