Extensive changes to look; added buttons