Refactor button for session
closes #19