fixing reload-bug / better object-marking / resort setup-tabs