Small modifications to TopPanel