Add design and fixes