Much refinement
Improve looks