Style and design modified