Various fixes for the panel