Various Improvments (closing a single viewbox)