Pretty Logicat buttons and some fixes