some layout changes to correct panel style