Frans twisk feature/front end fixes