Several bug fixes
Fixes auto layout constraint issues