Added some constraints for layout