WOrking on the static mockup more