Fixed button contrast issues, resolves #93 and resolves #94