refactor logic
UI change to make homepage more intuitive