Fix Swipe Issue
Fix toolbar height issue.

Still have swipe issus.
Both bugs seem fixed, Hopefully.