ui optimization by Azzeddine