Added (bad) icons to the small buttons. Improved some code all around.