add links/buttons and minor improvements