Refactor buttons and removed unnecessary borders around buttons