Started to add ui for more data