Fixed Add / Remove Buttons

Conclusion: Java is high right now;