Removed some deprecated code, added button