Fixed Panel View bugs