Fixing some display issues - ready to deploy again