Draw a border on buttons and add missing javadoc @throws description