[CHANGE] Element layout, flow to match UX [INIT] Map for element