Rearranged the tables, added a loading image.