Update, styles and cleanup