Further styles improvements