Bugfix - No border for all buttons