layout and file fixes