Made button nicer, added better error
Merge remote-tracking branch 'steve/master'