Fixed restoration, adjusted minor visual issues