Changed look & feel to L&F and other minor fixes