lots of changes- almost all UI/UX