Display fixes and bean updates