Clean up skill bugs and tweak UI