fixed layout
added stub service test