* Design changes based on Kevin's mockups