layaout and view file fixes