Back in it! UI architecture work, fixed minor issue with skill