Make styling of links/buttons if form consistent and also late night commit [completes, #67721422]