Arms new UI fix

-still not 100 ready