UI minor changes
Code optimized