Update and cleanup styling once more