Fix issue #40 and #42 and remove custom javancss code.