Updated to include all presentation components