verious improvements and corrections for new framework layout.