Fixed some UI placement issues (texts and icons)