Made button nicer, added better error