Tidied files and added buttons