design added and bugs removed