Made buttons a user config (preparing for adding tap etc) +...

minor tidy up
+ comments
fixed comments in User_setup file - so code actually compiles