Bug fixes, service page mock up