Crash fix + aesthetic change