Changing table behavior, adding some icons