Added borders to control panels, adjust layout of buttons and panels.