fixed some auto layout issues