[Update] more screens skinned and reworked