changes to active btn's + tidy up