last fixes for mockup