Attempted to Fix Layout Problems
Merge branch 'master' of https://github.com/Tdan-Bubble-Tea-App/android_app