Some changes, but the icons need to be fixed