some fixes, added icons to buttons. tidied up lists