Look and feel improved 2.0