Small changes to frontend and reorganised scripts