Reorganising topmarks

Reorganising top marks, adding more buoys