Final UI
Merge branch 'master' of https://github.com/CloudFlix/Project_CloudFlix