Modified Mock ups slightly