Improved some UI components