Display and architecture related updates and cleanup