Refactored some lambda, removed an unused panel
Tweaked Optional usage