Changed it so views do not stack
Merge remote-tracking branch 'origin/master'