code formatting and icon change