Added some design and fixed some issues