Updated design and fixed table reload