layout and service bug fixing