Some additional styling as well as mergeing the files successfully and fixing final bugs.