pull dev
fix merge
dev panel show hide and styling