FS-48 ui fixes