Overview view complete, bug fixes