Added flow functionality, updated elements