Done

- Need to fix renderign issues when runnin on device.