A few updates, fixed layout appearing bug in service