Fixed and reorganized overview and lab