ORganised and added new GUI