Patch to fix program loading
progress on new layout