More UI Tweaks, adjustment for refactoring done on LAF