last version of the mocks.
updating after css/js refactoring