Changed some UI layout + strings