Added the rest of the mockups and did more cleaning.