fixed done screen layout
merged