Multiple header bugfix and small front end change