Major changes to style and dynamic components