fixed autolayout and added pop