Fixed visual bug and updated some data