Add ID to features and visualisation and re-structured