Working on creating a new ui based on mockup