UI enhancements

Changed Barbells in from to buttons to have a consistent flow