Fixed some issues with UI states.
Worked on skins some more.