Improve buttons & fix visited state font color