Remove block settings & nav icons more cleanly