Fixed buttons

Fixed buttons highliting