Changed some parts of the structure to fit the new user interface