Merge pull request #197 from EnacheB/master

Made buttons uniform
Updated equipment art
Trimmed bars so they don't move weird