Fixed bgcolor border buttons when active
several updates