Common Service, small changes in preview layout