Updated to latest styles