Cleanup old styles + minor display bugfix