minor fix and set autolayout