Added servicelocator and layout, refactored application.