Updated to remove setLayout