Cleaning up some styles, adding loading etc.