Added some functionality to overview and main