button code cleaned up, restart code in progress