Improved auto layout to be more universal