Design fixxing

started design fixxing