updated for full moblile UX