my changes
impreved ui