Styles improvements