fixed #93 #106 for good.
resolved some Autolayout issues