Tray - almost done

This is very close to be done but I still notice certain issues that should be fixed. Would appreciate any feedback.