Updated design

Bug fixes