After new skin
After new skin (2)
Fixes to layout and behavior to make really work.