Refactor triggers, refactor series learning, clean up layout