Added files and tidied up layout