Add design and more functionallity