Add font, remove onclick events, other minor changes