Added message string and removed unneccesary layout params code