GUI components unification & improvements