Add panel title
Drop hacks, shows issue with tab style